Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Added support for plural_name for foods #4129

Closed
wants to merge 102 commits into from
Closed

feat: Added support for plural_name for foods #4129

wants to merge 102 commits into from

Conversation

Choromanski
Copy link
Contributor

@Choromanski Choromanski commented Aug 31, 2024 •
edited
Loading

What type of PR is this?

  • feature

What this PR does / why we need it:

This PR allows the seeder to import plural names for foods.
This allows for new user have cleaner ingredient lists without having to do any additional configuration.

Which issue(s) this PR fixes:

N/A

Special notes for your reviewer:

  1. This work was discussed in feat: Seed support for plural units #3933
  2. If anything is done that causes issues with crowdin let me know and I can work to resolve it.
  3. I only provided plurals for foods that would normally be the unit (ex. 1 watermelon)
  4. I sorted the list by keys so that I could de-duplicate easier
  5. I also removed some words that were duplicated in there UK equivalent (ex. aubergine/eggplant, broad/fava beans, icing/powdered sugar)
  6. Any comments or recommendations would be greatly appreciated

Testing

Ran a fresh install and all of the plural ingredients were seeded properly:
image

@Choromanski Choromanski marked this pull request as ready for review August 31, 2024 03:07
@michael-genson
Copy link
Collaborator

@hay-kot would you be able to look at this one? Just want to make sure it won't break existing translations (or if it will, we have some way of fixing them)

@hay-kot
Copy link
Collaborator

hay-kot commented Sep 11, 2024

I believe that Crowdin will automatically pick up the changes, however the other files would get overridden, so I think this PR also needs to migrate all the other language files as well.

@Choromanski
Copy link
Contributor Author

I will work on updating the other files

@Choromanski
Copy link
Contributor Author

@hay-kot if you would like to pull the update from crowdin again let me know and I can reformat with the new updats

@Choromanski Choromanski force-pushed the feature/food-seed-plurals branch from c9abf13 to ce3d617 Compare September 14, 2024 03:16
Choromanski and others added 22 commits October 1, 2024 18:53
@Choromanski
Added support for plural_name for foods
0061af8
@Choromanski
Fixed some issues, and added plurals for all items that might be the …
ef9955d 
…unit
@Choromanski
Sorted the foods
e9c0637
@Choromanski
Removed UK language should be in en-UK, ignored Scallions, green onio…
4358b7a 
…ns & spring onions
@Choromanski
Removed spacing for CI
aba0440
@Choromanski
Updated test_seed_foods to reflect the new number of foods in the see…
544634f 
…d data
@Choromanski
Fixed comments in test_group_seeder.py
592cdec
@Choromanski
Removed exta potato that I missed
2198172
@Choromanski
fix: PWA respects orientation lock (mealie-recipes#4143)
996e9b1
@renovate @Choromanski
fix(deps): update dependency sqlalchemy to v2.0.33 (mealie-recipes#4149)
c0fe1cd 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@boc-the-git @Choromanski
feat: Automate release drafting (mealie-recipes#4147)
66b31f9
@hay-kot @Choromanski
chore(l10n): New Crowdin updates (mealie-recipes#4145)
2e8922a
@boc-the-git @Choromanski
chore: Set 'chore' label on PR (mealie-recipes#4154)
4648e3d
@boc-the-git @Choromanski
chore: Set "documentation" label on PR (mealie-recipes#4153)
afa41ec
@renovate @Choromanski
fix(deps): update dependency fastapi to v0.112.3 (mealie-recipes#4159)
dc8fe5e 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate @Choromanski
chore(deps): update dependency ruff to v0.6.4 (mealie-recipes#4160)
92398c3 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate @Choromanski
fix(deps): update dependency fastapi to ^0.113.0 (mealie-recipes#4161)
10c6c70 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate @Choromanski
fix(deps): update dependency pydantic to v2.9.0 (mealie-recipes#4162)
d1ead75 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate @Choromanski
fix(deps): update dependency openai to v1.43.1 (mealie-recipes#4164)
1423b63 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@michael-genson @Choromanski
docs: OpenAI Documentation (mealie-recipes#4165)
0a68661
@renovate @Choromanski
fix(deps): update dependency sqlalchemy to v2.0.34 (mealie-recipes#4156)
ef488be 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@michael-genson @Choromanski
docs: Added OpenAI Page to mkdocs (mealie-recipes#4167)
200706d
renovate bot and others added 24 commits October 1, 2024 18:53
@renovate @Choromanski
chore(deps): update dependency ruff to v0.6.7 (mealie-recipes#4249)
1aae037 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@michael-genson @Kuchenpirat @Choromanski
feat: Filter Recipes By Household (and a ton of bug fixes) (mealie-re…
45e51f9 
…cipes#4207)

Co-authored-by: Kuchenpirat <[email protected]>
@michael-genson @Kuchenpirat @Choromanski
feat: OpenAI Custom Headers/Params and Debug Page (mealie-recipes#4227)
05b3d6a 
Co-authored-by: Kuchenpirat <[email protected]>
@hay-kot @Choromanski
chore(l10n): New Crowdin updates (mealie-recipes#4256)
32d16e7
@github-actions @boc-the-git @Choromanski
chore(auto): Update pre-commit hooks (mealie-recipes#4255)
514fbc6 
Co-authored-by: boc-the-git <[email protected]>
@renovate @Choromanski
fix(deps): update dependency rapidfuzz to v3.10.0 (mealie-recipes#4257)
8ec1408 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate @Choromanski
fix(deps): update dependency alembic to v1.13.3 (mealie-recipes#4258)
222d521 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate @Choromanski
fix(deps): update dependency openai to v1.47.1 (mealie-recipes#4259)
4c07092 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate @Choromanski
fix(deps): update dependency tzdata to v2024.2 (mealie-recipes#4261)
44bd649 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@hay-kot @Choromanski
chore(l10n): New Crowdin updates (mealie-recipes#4264)
869cabf
@Wetzel402 @Kuchenpirat @Choromanski
feat: Shopping list UI overhaul - add label headings per category (me…
49cc627 
…alie-recipes#4235)

Co-authored-by: Kuchenpirat <[email protected]>
@renovate @Choromanski
chore(deps): update dependency pylint to v3.3.1 (mealie-recipes#4265)
f625440 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@seamuslowry @Choromanski
feat: sort labels by name,asc in shopping lists (mealie-recipes#4253)
2f2dff9
@renovate @Choromanski
chore(deps): update dependency mkdocs-material to v9.5.37 (mealie-rec…
69cbcec 
…ipes#4267)
@hay-kot @Choromanski
chore(l10n): New Crowdin updates (mealie-recipes#4268)
ecb6017
@michael-genson @Kuchenpirat @Choromanski
docs: Update Docs for Households (mealie-recipes#4266)
85dc5a8 
Co-authored-by: Kuchenpirat <[email protected]>
@renovate @Choromanski
fix(deps): update dependency openai to v1.48.0 (mealie-recipes#4269)
8d0f067 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate @Choromanski
chore(deps): update dependency mkdocs-material to v9.5.38 (mealie-rec…
14f9b7e 
…ipes#4270)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@hay-kot @Choromanski
chore(l10n): New Crowdin updates (mealie-recipes#4271)
0a0e798
@jlssmt @Kuchenpirat @Choromanski
feat: add regex to url before scraping (mealie-recipes#4174)
6fce4a6 
Co-authored-by: Kuchenpirat <[email protected]>
@michael-genson @Choromanski
feat: Add Household Filter to Meal Plan Rules (mealie-recipes#4231)
b74ef08
@renovate @Choromanski
fix(deps): update dependency openai to v1.50.2 (mealie-recipes#4273)
79cde72 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate @Choromanski
chore(deps): update dependency ruff to v0.6.8 (mealie-recipes#4272)
a6c49be 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate @Choromanski
fix(deps): update dependency uvicorn to ^0.31.0 (mealie-recipes#4277)
3318d3b 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@Choromanski Choromanski force-pushed the feature/food-seed-plurals branch from 2c9ebe3 to 3318d3b Compare October 1, 2024 22:54
@Choromanski
Copy link
Contributor Author

Whoops, I destroyed this PR, will create a new one

@Choromanski Choromanski closed this Oct 1, 2024
@Choromanski Choromanski mentioned this pull request Oct 1, 2024
Merged
@Choromanski Choromanski deleted the feature/food-seed-plurals branch October 23, 2024 02:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hay-kot hay-kot hay-kot left review comments

Assignees
No one assigned
Labels
feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.